+Sun Feb 29 22:01:49 2004 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkentry.[ch]: Add gtk_entry_set_alignment()
+ to allow right-aligned entries and a "xalign"
+ property. (#59799, patch from Egon Andersen and
+ Steffen Gutmann)
+
+ * gtk/gtkmisc.c (gtk_misc_class_init): Use improved
+ xalign property description here too.
+
+ * tests/testtext.c: UNDERLINE_ERROR test addition
+ from Nicolas Settons' patch.
+
Sun Feb 29 20:34:06 2004 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.[ch] gtk/gtkmenushellx.c: export
+Sun Feb 29 22:01:49 2004 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkentry.[ch]: Add gtk_entry_set_alignment()
+ to allow right-aligned entries and a "xalign"
+ property. (#59799, patch from Egon Andersen and
+ Steffen Gutmann)
+
+ * gtk/gtkmisc.c (gtk_misc_class_init): Use improved
+ xalign property description here too.
+
+ * tests/testtext.c: UNDERLINE_ERROR test addition
+ from Nicolas Settons' patch.
+
Sun Feb 29 20:34:06 2004 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.[ch] gtk/gtkmenushellx.c: export
+Sun Feb 29 22:01:49 2004 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkentry.[ch]: Add gtk_entry_set_alignment()
+ to allow right-aligned entries and a "xalign"
+ property. (#59799, patch from Egon Andersen and
+ Steffen Gutmann)
+
+ * gtk/gtkmisc.c (gtk_misc_class_init): Use improved
+ xalign property description here too.
+
+ * tests/testtext.c: UNDERLINE_ERROR test addition
+ from Nicolas Settons' patch.
+
Sun Feb 29 20:34:06 2004 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.[ch] gtk/gtkmenushellx.c: export
+Sun Feb 29 22:01:49 2004 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkentry.[ch]: Add gtk_entry_set_alignment()
+ to allow right-aligned entries and a "xalign"
+ property. (#59799, patch from Egon Andersen and
+ Steffen Gutmann)
+
+ * gtk/gtkmisc.c (gtk_misc_class_init): Use improved
+ xalign property description here too.
+
+ * tests/testtext.c: UNDERLINE_ERROR test addition
+ from Nicolas Settons' patch.
+
Sun Feb 29 20:34:06 2004 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.[ch] gtk/gtkmenushellx.c: export
+Sun Feb 29 22:01:49 2004 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkentry.[ch]: Add gtk_entry_set_alignment()
+ to allow right-aligned entries and a "xalign"
+ property. (#59799, patch from Egon Andersen and
+ Steffen Gutmann)
+
+ * gtk/gtkmisc.c (gtk_misc_class_init): Use improved
+ xalign property description here too.
+
+ * tests/testtext.c: UNDERLINE_ERROR test addition
+ from Nicolas Settons' patch.
+
Sun Feb 29 20:34:06 2004 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.[ch] gtk/gtkmenushellx.c: export
+Sun Feb 29 22:04:43 2004 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtk-sections.txt: Add gtk_entry_get_alignment
+
+Sun Feb 29 20:32:18 2004 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtk-sections.txt: Add gtk_window_mnemonic_activate
+
Sat Feb 28 01:14:23 2004 Matthias Clasen <maclas@gmx.de>
* gtk/migrating-GtkComboBox.sgml: New chapter.
gtk_entry_set_has_frame
gtk_entry_set_width_chars
gtk_entry_get_invisible_char
+gtk_entry_set_alignment
+gtk_entry_get_alignment
gtk_entry_get_layout
gtk_entry_get_layout_offsets
gtk_entry_get_max_length
/* Maximum size of text buffer, in bytes */
#define MAX_SIZE G_MAXUSHORT
+typedef struct _GtkEntryPrivate GtkEntryPrivate;
+
+#define GTK_ENTRY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_ENTRY, GtkEntryPrivate))
+
+struct _GtkEntryPrivate
+{
+ gfloat xalign;
+};
+
enum {
ACTIVATE,
POPULATE_POPUP,
PROP_ACTIVATES_DEFAULT,
PROP_WIDTH_CHARS,
PROP_SCROLL_OFFSET,
- PROP_TEXT
+ PROP_TEXT,
+ PROP_XALIGN
};
static guint signals[LAST_SIGNAL] = { 0 };
P_("The contents of the entry"),
"",
G_PARAM_READABLE | G_PARAM_WRITABLE));
+
+ g_object_class_install_property (gobject_class,
+ PROP_XALIGN,
+ g_param_spec_float ("xalign",
+ P_("X align"),
+ P_("The horizontal alignment, from 0 (left) to 1 (right). Reversed for RTL layouts"),
+ 0.0,
+ 1.0,
+ 0.0,
+ G_PARAM_READABLE | G_PARAM_WRITABLE));
signals[POPULATE_POPUP] =
g_signal_new ("populate_popup",
P_("Whether to select the contents of an entry when it is focused"),
TRUE,
G_PARAM_READWRITE));
+
+ g_type_class_add_private (gobject_class, sizeof (GtkEntryPrivate));
}
static void
gtk_entry_set_text (entry, g_value_get_string (value));
break;
+ case PROP_XALIGN:
+ gtk_entry_set_alignment (entry, g_value_get_float (value));
+ break;
+
case PROP_SCROLL_OFFSET:
case PROP_CURSOR_POSITION:
default:
case PROP_TEXT:
g_value_set_string (value, gtk_entry_get_text (entry));
break;
+ case PROP_XALIGN:
+ g_value_set_float (value, gtk_entry_get_alignment (entry));
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
static void
gtk_entry_init (GtkEntry *entry)
{
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
+
GTK_WIDGET_SET_FLAGS (entry, GTK_CAN_FOCUS);
entry->text_size = MIN_SIZE;
entry->is_cell_renderer = FALSE;
entry->editing_canceled = FALSE;
entry->has_frame = TRUE;
+ priv->xalign = 0.0;
gtk_drag_dest_set (GTK_WIDGET (entry),
GTK_DEST_DEFAULT_HIGHLIGHT,
static void
gtk_entry_adjust_scroll (GtkEntry *entry)
{
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
gint min_offset, max_offset;
- gint text_area_width;
+ gint text_area_width, text_width;
gint strong_x, weak_x;
gint strong_xoffset, weak_xoffset;
+ gfloat xalign;
PangoLayout *layout;
PangoLayoutLine *line;
PangoRectangle logical_rect;
/* Display as much text as we can */
if (gtk_widget_get_direction (GTK_WIDGET (entry)) == GTK_TEXT_DIR_LTR)
+ xalign = priv->xalign;
+ else
+ xalign = 1.0 - priv->xalign;
+
+ text_width = PANGO_PIXELS(logical_rect.width);
+
+ if (text_width > text_area_width)
{
min_offset = 0;
- max_offset = MAX (min_offset, logical_rect.width / PANGO_SCALE - text_area_width);
+ max_offset = text_width - text_area_width;
}
else
{
- max_offset = logical_rect.width / PANGO_SCALE - text_area_width;
- min_offset = MIN (0, max_offset);
+ min_offset = (text_width - text_area_width) * xalign;
+ max_offset = min_offset;
}
entry->scroll_offset = CLAMP (entry->scroll_offset, min_offset, max_offset);
*y += text_area_y;
}
+
+/**
+ * gtk_entry_set_alignment:
+ * @entry: a #GtkEntry
+ * @xalign: The horizontal alignment, from 0 (left) to 1 (right).
+ * Reversed for RTL layouts
+ *
+ * Sets the alignment for the contents of the entry. This controls
+ * the horizontal positioning of the contents when the displayed
+ * text is shorter than the width of the entry.
+ **/
+void
+gtk_entry_set_alignment (GtkEntry *entry, gfloat xalign)
+{
+ GtkEntryPrivate *priv;
+
+ g_return_if_fail (GTK_IS_ENTRY (entry));
+
+ priv = GTK_ENTRY_GET_PRIVATE (entry);
+
+ if (xalign < 0.0)
+ xalign = 0.0;
+ else if (xalign > 1.0)
+ xalign = 1.0;
+
+ if (xalign != priv->xalign)
+ {
+ priv->xalign = xalign;
+
+ gtk_entry_recompute (entry);
+
+ g_object_notify (G_OBJECT (entry), "xalign");
+ }
+}
+
+/**
+ * gtk_entry_get_alignment:
+ * @entry: a #GtkEntry
+ *
+ * Gets the value set by gtk_entry_set_alignment().
+ *
+ * Return value: the alignment
+ **/
+gfloat
+gtk_entry_get_alignment (GtkEntry *entry)
+{
+ GtkEntryPrivate *priv;
+
+ g_return_val_if_fail (GTK_IS_ENTRY (entry), 0.0);
+
+ priv = GTK_ENTRY_GET_PRIVATE (entry);
+
+ return priv->xalign;
+}
+
/* Quick hack of a popup menu
*/
static void
void gtk_entry_get_layout_offsets (GtkEntry *entry,
gint *x,
gint *y);
+void gtk_entry_set_alignment (GtkEntry *entry,
+ gfloat xalign);
+gfloat gtk_entry_get_alignment (GtkEntry *entry);
void gtk_entry_set_completion (GtkEntry *entry,
GtkEntryCompletion *completion);
PROP_XALIGN,
g_param_spec_float ("xalign",
P_("X align"),
- P_("The horizontal alignment, from 0 (left) to 1 (right)"),
+ P_("The horizontal alignment, from 0 (left) to 1 (right). Reversed for RTL layouts"),
0.0,
1.0,
0.5,
"underline", PANGO_UNDERLINE_SINGLE,
NULL);
+ tag = gtk_text_buffer_create_tag (buffer, "underline_error", NULL);
+
setup_tag (tag);
g_object_set (tag,
- "underline", PANGO_UNDERLINE_SINGLE,
+ "underline", PANGO_UNDERLINE_ERROR,
NULL);
tag = gtk_text_buffer_create_tag (buffer, "centered", NULL);
gtk_text_buffer_apply_tag_by_name (buffer, "underline", &iter, &iter2);
+ gtk_text_buffer_get_iter_at_line_offset (buffer, &iter, 1, 4);
+ gtk_text_buffer_get_iter_at_line_offset (buffer, &iter2, 1, 7);
+
+ gtk_text_buffer_apply_tag_by_name (buffer, "underline_error", &iter, &iter2);
+
gtk_text_buffer_get_iter_at_line_offset (buffer, &iter, 1, 14);
gtk_text_buffer_get_iter_at_line_offset (buffer, &iter2, 1, 24);
projects / gtk4.git / commitdiff